Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature: Added support to switch between items using arrow keys in the conflicts dialog #13357

Merged

Conversation

ferrariofilippo
Copy link
Contributor

Resolved / Related Issues

Details
Please, note that the former line 121 (conflictItem.CustomName = string.Empty;) was removed from EndRename() as it was causing a crash.
Steps to reproduce (Stable or Preview):

  • Reach the Conflicts dialog
  • Click on an item to rename it and then click away
  • Repeat until eventually Files crashes (the number of required iterations depends on the depth of the destination. e.g. C:\Users\USERNAME\Documents\files.txt should take 5 cycles)

Validation
How did you test these changes?

  • Did you build the app and test your changes?
  • Did you check for accessibility? You can use Accessibility Insights for this.
  • Did you remove any strings from the en-us resource file?
    • Did you search the solution to see if the string is still being used?
  • Did you implement any design changes to an existing feature?
    • Was this change approved?
  • Are there any other steps that were used to validate these changes?
    1. Copy & paste some files that require the Conflict dialog
    2. Click on an item name
    3. Use Up & Down arrows to move between the names
    4. Mark some items with Skip
    5. Check that you don't land on them using arrows

Screenshots (optional)

ConflictArrows.mp4

Copy link
Member

@yaira2 yaira2 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@yaira2 yaira2 changed the title Feature: Switch between items using arrow keys in the conflicts dialog Feature: Added support to switch between items using arrow keys in the conflicts dialog Sep 13, 2023
@yaira2 yaira2 added ready to merge Pull requests that are approved and ready to merge and removed needs - code review labels Sep 13, 2023
@yaira2 yaira2 merged commit 7a6ddb5 into files-community:main Sep 13, 2023
2 checks passed
@ferrariofilippo ferrariofilippo deleted the Feature_Conflict_Switch_Arrows branch September 14, 2023 15:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ready to merge Pull requests that are approved and ready to merge
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Feature: Switch between items using arrow keys in the conflicts dialog
2 participants